[#33] [#34] Marcin Grzejszczak's suggestions