more tweaks to make it load faster.