Functions revised with units re-defined