Added EPFL solution class