Improved performance
Added wiggling