Switching to my own modal system