perparing for database test
minor changes