rename method and some updates