added ryan's changes