can we commit us that i will do this in a future code review of this part?