Updated for defaut
Removed trailing characters
Updated for default