With Elie's troubleshoot