models revised
Some changes are implemented