Switched to using shapes, bug on start up