incorporated criticism from romainl on reddit