Some change to chargen