Partial 2.1 proposal