Incorporate Jesse's changes