added more in solution