Added and (hackily) solved SUBS