upvoting fixed + kyle's new features