Changes and added new functional

Changes and added new functional