Re-filing and adding main script