wip
address comments for #304