Change Roll limits and add control filters