Seems to be the good way to go now