added ability to choose shape and fill style