Marked TODO for Grey

Update this section in the same way as for the other