Andrew's animation and build.xml changes