Removed broken variable passing