Added and completed part 2a