implementing requirement #212