tweaked schema