Added some randomize
Clean up