Modifications for * cases. NOT working version.