merging back loading changes and clock snapped version