update to common building blocks