This is convoluted, mind if I rewrite it?