Made some changes through route testing and editing