Nicky's changes