Modified structure to fix compass watch error, issue #10