Minor changes
Started on db connection