Improved timer handling... still not perfect