renamed methods
commit after second conflict