applied changes from 1.0