Beta 2.0 update

added new option and modifications