added effects and fixed routing