Fix
Improved functions