Updated to address points raised by bska.