Incorporate PJ's changes & such