nick - finished chuck's changes update