Added changes up until panel's level 2 bug