Multiple subs (branched from old version)

Does not have all the changes of the most recent version