Added changes from Amir's punchlist