Oi Oi, take this to the improvement thread.