Better structure and added compass support.