Worklist and some adjustments