Push and Pull work (also samurai got fixed last update)