changes to match the latest refactorings in kollavrsha