Last commit before 2.0 update