edits to Jeff's methods