Changed with solution