Be more user friendly