Design principles modification

Actually we're not focused on the emergency case for now, since that
one is rather special.