Added several new functions