Modal added
I have merged my work with yours