andre oving6 commit, i normal mode