Changed controller around a bit to use different state config