and some more udpates