some refactor and making acceleration work
I forgot this
and this...