some more risky timing changes