fix: updated to address nolan's comments