Added debug switch
Added debug switch and stepup to beta3.2