Seems good, but we can merge as is and change afterwards.