Modified functions
Forgot init()