OK time for a rethunk I think