Many more changes, timed callbacks etc