Incorporating input from Nick