line of code out of date - need to merge