#2 changed working w/ DB