removing the old got a simpler one