From last task's feed back, I choose to use underground extension to rework with the state library, here is the first attempt at redesign.