merged code with latest db changes