Changes to Accelerometer class