some main changes