Updated to 3.1
cleaned