For #4 ,#8 issue and prioritized work #4