Some changes and a timer