Slight change to maintain original code