Compass reworked

by Daniel GILLES