Enhancement to v1.1