wip
address some concerns in PR