Edited the old code that cropped up in merger..... :-/