working on if
rename method