Wojciech Trocki can we close this one? i notice that the pr is closed so just pinged in the pr to see if the changes were added in the correct place.