Updated to NOT use local db