I wanna merge this before I change the database