New branch. Some updates.