First changes and comments