Functionality added and tested