[!] Fixed functions moving