Edits to Andreass methods