some kapor-related stuff added