Made some changes to the structure and how interruptions are handled.