Final tweaks. Version 2.1