added things in proper place