Changing some timings to wait loops...