Made structural changes, added compass