Massive update, was lazy