refactor code //10 again