Refactor + crash fixed - Independant no update :/