Change and test new functions