improvements, and gif