finished all changes
