some more work on the take shift modal