Updated stuff, apologies for bad form