Board Thread:Code Review/@comment-5211495-20171020141541/@comment-4018164-20171020151230

Try this- it should also make it expandable more easily: