Prof ed cherry picked changes