Updated to include new NEPHO_ vars