More tweaks to store script