Started adding search optimisation