More structure and edited shebang(s)