additions towards to version 2.0