krzychu and lukasz merged - working