Added random warp
Merge stuff