Changed init and draw methods to work together