Finished except version switching. Change default to 4.1