add time saving improvement