Making it more user friendly