update from kokxx 2