update from Gir2ka MAster