removed all hard codes urls