work on animation scripting
fixed merge