updates to bring into line with new octopus