fixed problem with last commit
removed some tempVars but there still are a lot ;)