added detection of other types of moves