Small touches final commit before the finishing touch part 2