Added some controls to make it work easier