updated 3.1 again