Commenting because I'm also struggling to find a decent replacement