Changed to take parameter instead of asking