More work on the work packages