simplified and fixed timing