merged in latest changes.