A Safer Rental Map