close to final version a small bug with movement only