issue #1

 -- SQL scripts modified