added where, removed email, without flask and database