addressed half of modal issues