Improved solutions a bit