added philschanges
merged