YMZ:TODO: need to look at this further