Jake's changes