added flag + rename method