Performance tuning and remapping

loading