Added Tyler's changes