More work on notes jobs