Missing semis
Removed hard coded sub list