removed ParseScriptLOader
merged conflict