Comments from kamil chelstowski (@hefajj)