Minor changes after applying it to the new case