applied stephen's initial patch