some more changes to pubs models