resolved issues - wip