updated loader? (hasty checkin sorry)