Updating the functionality in order to test