reverted part 4 to initial solution