added underscore and used it in a method
merge fix