SQL rework started