Updated the candidate solutions, I did not finish it the last time...