Added support for non-thinking panels