Add comments and change database
Change database