almost there
fix timing