3.1 - Final Changes