v0.5 Fixed timing bug from code simplification