Replaced loader with new loader (loader2)