modifying to fit angular routing