refactored 1.sql. No need for 2.sql until next time