adding in mapper