Added functionality to display only some subs