fixing a thing i changed
Merge branch 'ryan'