DATABASE NEED TO BE UPDATE