Nick's changes