working on modal
fixed merge conflicts