merged Jesse's changes