still trying to fix routing