Updating to be more user friendly