Building tool and safety changes