added stuff that Chris was unable to push