Continuation from part 1 & 2