added goverment viz and modified classes