first level done scripting this time for real
merge fix