Added shields back in, whoops