working on database
update for presentation
merge