Added update and draw methods