Fixing Issues part 1