not finished
fixed timing issues