animation changes
fixing conflicts