Final commit. Last changes.