Added tan generator