some codechanges and graphics.