More work toward 2.0