modified (type something) case to handle better