big improvements move behaviour