Better handling of breaks (I think?)