tidy up  to include compass