Moved specializations out of step