Adjusted for new location of output