Version 2.0

Code improvments