improved readability, included movement exceptions