Removed GPS, added Accelerometer