Revert because it finally started working and add compass