Further opptimization.