Kyle's changes