Power jobs from data
Tidy up