revived some code which I wrongly nuked during the code cleanup
revived some code which I wrongly nuked during the code cleanup

MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame