Continuing to tweak code.