Final version
Final version with database