Merging with Jesse's changes