Issues part 3
Updated files