v2.41 Added for Future Development