HwEx06b: Initial Commit, including requested changes