big update for huge bug