Added newly subbed and some other cleanup