Changes to reduce calls to get_ken