Database is now hopefully more stable