I have switched to Martini. It was not really drop-in, but now it's done.