Incorporated Jerome's changes