major updates -- will doc later