web refactor part 2