Added affinity masking and variable speed units