Added Modal
fixing merge