Updated to use "dot" utility