massive update.. plz don't break