Fixing some functions
Merging, fixing function