adding changes after mikes disaster :) :) :)