try to fix modal and merge with julian