Change to properties instead of vars