Added pausing, structural changes