corrected pubs, updated plan