change to Solution class format