Restored changes lost in merge & cleaned up