fixed timingand stuff