working builder and scanner
update blueprints to new style