-Change to solution format;