added in scripts and reogranized