added @bellthoven feedback