Updated to version 3.1