adding carnaby back and fixing version madness again