General modifications to accomodate the example in the works