merged PR, issues remaining