Updated \u@\h [\w]:  again