if you agree with the features I implemented, we can keep everything upstream. is that ok with you?