PJs Suggestions

@sahiltrikha @renagadex2 @itorres1 @mwagner19446 @zstayman