Updated user and till behaviour