My changes v1.0