Made Changes to Calendar and db_connect