added todo for 1.2