add requested changes from vallorics comments