Fix for V1

Changes to make a stab at a v1