eliminated all hard-coded urls