updated to new blueprints