Added back in remove extra variable