Use more recent defined functions