Narrange
References removal
Attempt to improve loading duration