changes according to Lukasz Jedrzejczak remarks