Rework for homepage speed