Overwriting Jeff's changes