Same as above - handle in the logic?