Reversing work from #2 - scrapping issue.