Modified some of the Controller code Moved Funnel for the time being