Switched over to a more centralized logic system