PM: Some additions..