some changes
changed routing