inherited changes #2