Final Commit from Sun group meeting