adding in ryan's stuff