Tyler's changes