Cleaned solution and modified here.