Changed all toExternalForm() to toString()