Updated to Version 3.1