split up job a bit more