Updated to my working case