Changes to ATM code