added proper movement