Database edit

Edited some functionality