v1.0 Removed duplicate var