Moved more stuff to pub sub