few modifications in model