remove timing from those wrong spots