I think you're right Diapolo - and that should allow me to remove the timer I added in this file too, and base updates on the model updates.