first step in getting this to work with 3.0.7