add breaks and all that fun stuff