re commit kcampen branch