Added old code as comment