with animation fixes and info