Removing hard-coded URL... no way, hard coded ?