Completed Additional Shape Tools