New 2020 Fully Enclosed Version, With Automatic