adding up to street6 per #226