Olivia added color and other features; Joseph added DB code