Feedback from @robertkowalski