fixed timing!