Moved some vars to the right section