Using references now instead of raw values