updated input section and reworking building blocks section