Seems ok at first glance now