Use new function from the library
Optimize with mvp
refactor, still need to reset after rotate