added a feature and added some time estimates