Modified for new parallell execution environement