updates from 1.0