Updated for new panels