commiting Kawan changes