[3.1] General Changes