worked on controls a bit