Changes up to v2.0.4