fixed to gif and edits