Imported Chalie's branch, with db login detail changed