Nightmare gov: added some new parmaters and sorted out!