PE3 changes from Carthik

Helping with some merge issues