Bug fix and add new plug in shape