Version 2.1

Code validation and optimization