edited routes & controllers