Forget to change some function calls, changed them to work properly