Solved and uploaded