made changes suggested by coder module