with animation fixes