Modified State controller and routes