fixes. New loader