Dev 2.0

merging updates