added filepath changing to remove or add the username part in the string