Changed vars to properties