Added ordering to live and also removed padding from subs