Make it more user friendly