lot of changes for animation