Included modal in the addition
Merge branch 'modal'