Added Nick's changes