Added gif and fixed field match