modify for solution