Some main changes