added back initial solution