Should delete this conditional code - since it is now unconditional below.