ADD script runner
FIX conflicts