finish updates for current poc5 build