Updated with the predefined variables