Corrected functions...