huge blob of updates to poc4