Slightly better version based on pullrequest comments