Updating from Kyle's branch