Some udpates - v1.1