fixixing some timing discrepancies