@mauzepeda did u want to address this so we can merge?