Refined init.sh and reverted some changes for time being