uploaded partial solution fix 2 methods