changed modal for star three
fixed merge conflict