Upgrading compass [DO NOT MERGE]