Rework about modal