Update 1.0

still in BETA