filled out more for #70