updated version for working on v1.1