Added the old code as comments