let me change the title of my PR and remove the flag flipping the rest is still good to review