Working when removed for panel upgrade