reworks methodology to close #1649 and close #1064