changes in light of @jhmullen comments