Hoisting, some fixes
Update method
Update method fix