Add some new functions...