Issues fixed ! Fully fonctional