Modified to remove test variable