Now in 2D
Removed stuff