Implemented the new feature in necixydemobranch2 brach.