Removed shift clause so that masking tool works.