readded modal
merged