More fixed and added gif