Jesse's changes