Added v200 option. Minor modification on small stuffs