Implemented work-sharing in a saner way.
Bugfixing.