Separate DB almost fixed