updated version, added better functionality..