new functions
Merge Branch