Update 0.2 + addition