User story 6 + db modification