Sincronized with demo, image optimization and small imprivements