Done with Panel in-scope changes