after some small updates discussed through voice call, i think it's fine

bubble