added juppir stuff