Incorporating Julep 2 changes