more work on mappanel state