updated to reflect requested changes