added some more user friendly functionality