Made adjustments to solution