adjusting to use proper routes