Fixed update(), fixed draw()