Makes structure even better :)
Adds B707 B717 B727