final version - new syntax db and client