Trying to optimise further