366 - changing code to source
366 - drop all the monkey patch code