Don't have to wait for the next firmware...