if you feel free then change the current cases as well within this PR and we will merge them as well cc/ @dantleech ^^ :baby: