modify to current sql