Final touches part 1