adding NAMI stuff