Modified some local variables