Working on controls
Controls are working much better now