Improve worker and prepare for going back to a complete release