Updated loader