Updates

more updates on branch 2