working on modal fix