hero movement done
all changes merged