organized methods, fixed case sensitive bug