Ok finally updating my contrib to a working version again