Changed replace to replaceAll