Updated to allow nick changes &c