Last changes to make it working ok.