I'm fine to do that. Gabriel: do you believe we should remove the "X" button or rather make it work by mimicing the "Cancel" behavior?