Yeah, this predates the code above - will remove