got rid of pub/priv