Making more user friendly