Changed functions to work with upper and lowercase (camel case works)