PS. I don't think this is essential to address before merging, just something to consider.