Fixed the solutions a bit more