Some changes to previous solutions.