update to support 1.2.1