Version 3.1 complete