V2.1
some more changes