All good points, tagging @baris to take a look