Rework after Joreg comments