finish the proposal to version 15