First updated version. However, quizz are note tested yet...