Added modifications to base url and stuff