Introduce resizing, still not working completly