some changes to pubs models