New Functionality and tests