fixed server timing stuff