Changes made to support custom timestops