revamp handling of 2d animations