initial patch changes