Bug fixed and Restructured