Update to include whiskers