Added time saving functionality