Restructure some stuff and add pauses