fix order bug, add new worker (not ready yet)