adding reply model
adding the rest of conditions
fixing an error
removing conflicts