some more update

some modification to meet requirement