Revert "Revert "Updated on the basic of new requirment""
Revert "Revert "Updated on the basic of new requirment""

This reverts commit c1e6b5ee7384ed9184b723734c937f448f7dedba.

kh3laghar/cse370,kh3laghar/cse370