Another Updated Panel Class