added order & frutype to the model
relocated order