Better wait accuracy