adding move and changing the timebehavior
I forgot to commit this