Updating modal because of issues