Fikset control origins

JAAA
Refactored routes