Removed eroll as it proved to be unnecessary