Move to Compass + rough rough working flip
Lovely tidy up