Added animations and buffer definition switch