updates from 1.2.1