Updated Routes and shit