lots of improvements made, transitions are more fluid, useless variables have heen removed