all changes from dev page finished