Rebuild basic functions
Merge