class renamed and one more analysis added