Added additional subs logic