[3.1] Other Changes