Works better
Fix crash at ending
Deshaking PoC