Classes by Daniel added