uncommented, added intr lines