We can just fix the new functions for now.