updates to make 1.2.0 work