Fixing lenses, to be more optimised.