added X stuff