beta functionality added