Adding accelerated mode back