Modifications to work in progress