Updated version (scale, layer.control)