Changed to only pull the current value