Reworking to allow for use with instance.pp which was never added/included in original