Merging changes
Adding vortex force controls