Processed feedback by @lazyhammer and @WouterJ