:exclamation: started fixing the functions