work on feature optimisation