Changed the way I handle shadowed variables