added assertions and modified value of some attributes