A lot of changes. v1.1.0