Made some changes to version and switches