Merged changes

Tyler's and my changes are now one