Further Julep 2 changes