advanced building blocks solutions
Merge pull request #680 from lcf0285/patch-5

advanced building blocks solutions