mainly current_knowledge improvements