diemmi's changes for part 2
merged