Implement and comment out conditional map add