Make changes requested by Arbesfeld, need to add tests