Optimised - slightly.