adding work from Nick