added velthuis support