get things working with shark branch again