much better page speed performance but still not done