more updates

WORKS WITH DB