More modifications for * cases.