Final version
Final version (+ new db)