Added original code and updated TODO