Adding concept to a part of the code (part 2)

Adding concept to a part of the code (part 2) #576