adding changes after mikes disaster :) :) :)

adding changes after mikes disaster :) :) :)