Updated presenter and database
Merged with lastest