Final changes

Here are final changes