Fix
Added more functions