updated with some db notes