Version 2.3.1

Additional Changes
Simplification