updated to 2.3.1-j6