still need to improve the little mistakes ;-;