Further rearranging of solution