removed some use of lookup (sped up pages)