Pt. 699 - fixme

Pt. 699 - fixme