Exercieses fixed: without PostgreSQL